From: Peter Michael Green Date: Thu, 19 Feb 2026 22:09:39 +0000 (+0000) Subject: Manual merge of version 4:25.8.4-1+rpi1 and 4:26.2.0-1 to produce 4:26.2.0-1+rpi1 X-Git-Tag: archive/raspbian/4%26.2.0-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22file:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22file:/?a=commitdiff_plain;h=e7c4dbfeb44a9f97e66b46df214eb782e7204758;p=libreoffice.git Manual merge of version 4:25.8.4-1+rpi1 and 4:26.2.0-1 to produce 4:26.2.0-1+rpi1 --- e7c4dbfeb44a9f97e66b46df214eb782e7204758 diff --cc debian/changelog index 28e76fb8325,1f2c74fa5f1..ea993986697 --- a/debian/changelog +++ b/debian/changelog @@@ -1,23 -1,76 +1,93 @@@ - libreoffice (4:25.8.4-1+rpi1) forky-staging; urgency=medium ++libreoffice (4:26.2.0-1+rpi1) forky-staging; urgency=medium + + [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green at Fri, 27 Apr 2018 02:14:18 +0000] + * Disable testsuite. + + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + + [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green] + * Use clang 11, newer versions cause armv7 contamination issues. + + [changes introduced in 4:24.2.5-1+rpi1 by Peter Michael Green] + * Build with gcc rather than clang. + * Disable skia. + - -- Raspbian forward porter Mon, 09 Feb 2026 08:40:31 +0000 ++ -- Peter Michael Green Thu, 19 Feb 2026 22:06:02 +0000 + - libreoffice (4:25.8.4-1) unstable; urgency=medium + libreoffice (4:26.2.0-1) unstable; urgency=medium - * New upstream release + * LibeOffice 26.2.0 final release (identical to rc3) + + * upload to unstable + + * debian/watch: back to releases/download.documenfoundation.org + + -- Rene Engelhard Wed, 28 Jan 2026 21:03:25 +0100 + + libreoffice (4:26.2.0~rc3-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/Rust-Bindings-Add-initial-documentation-for-Rust-UNO.diff: + as name says; from master + + * debian/rules: + - (temporarily) disable zxing on loong64 (and qt6-multimedia on m68k while we + are at anyway) + * debian/control.in: mention libreoffice-gtk3 instead of + libreoffice-gtk(2|3) (closes: #1126416) + + -- Rene Engelhard Tue, 27 Jan 2026 22:47:33 +0100 + + libreoffice (4:26.2.0~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - allow libmdds-dev 3.2 + - add loong64 to OOO_NOGUI_ARCHS to build -nogui variant there, fast + enough for the double build + * debian/watch: track rcs again + * debian/tests/control.rust.in: make test-rust_uno-example depend on + libreoffice-writer-nogui | libreoffice-writer as the former is not + built on risc64 + * debian/tests/control.in, debian/rules: make test-extension, + test-extension-shared, odk-build-examples and odk-build-examples-java + depend on libreoffice-core-nogui | libreoffice-core and remove now + unneeded special-casing of Architecture:. Avoid running it in riscv64 + for now + + -- Rene Engelhard Thu, 15 Jan 2026 07:05:56 +0100 + + libreoffice (4:26.2.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/skia-gcc-no-musttail.diff: also include alpha + (closes: #1122243) + * debian/patches/remove-JITC_PROCESSOR_TYPE-setting.diff: as name says. + Obsolete and fixes permissions of instdir/program/soffice during build + (e.g. for smoketest) - closes: #1122336 + + * debian/rules: + - use --enable-ld=mold if building rust-uno-bindings on riscv64 to speed up + its linking/make it work + - enable --enable-rust-uno on riscv64 (test-wise, it generally works and + linking is far better with the above and does not hang anymore; compile + still takes long but let's see - with parallelism output still might + happen...) + * debian/tests/test-rust_uno-example: increase timeout to 60s + * debian/*.symbols*: + - mark GLIBCXX_3.4 as optional, vanished in a (mold-using) riscv64 build, + is not in our namespace anyway and we get a far more uptodate libstdc++6 + dependency anyway + + -- Rene Engelhard Tue, 16 Dec 2025 21:47:37 +0100 + + libreoffice (4:26.2.0~beta1-1) experimental; urgency=medium + + * New upstream beta release * debian/patches/pdfium-ports.diff: add patch to fix pdfium build on sparc64 (closes: #1121498) diff --cc debian/control index b8fdc12fa7c,05fadd494b2..75c0b85ccf7 --- a/debian/control +++ b/debian/control @@@ -14,8 -14,8 +14,9 @@@ Build-Depends: autoconf binutils (>= 2.37-9) [ppc64], bison, bzip2, + cargo [!alpha !hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mipsel !mips64 !powerpc !powerpcspe !sparc], clang [i386], + clang-11 [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el], debhelper-compat (= 12), default-jdk (>= 2:1.9) [!hppa !hurd-amd64 !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !powerpcspe !s390 !sparc !ppc64el !s390x !armhf !armel] , dh-python , diff --cc debian/rules index 3afe15f548b,7ffaa2f78e2..69b7cd75bb4 --- a/debian/rules +++ b/debian/rules @@@ -633,9 -656,7 +658,7 @@@ OOO_BE_ARCHS = $(filter hppa m68k mips $(eval $(call gen_no_archs,OOO_BE_ARCHS)) OOO_LE_ARCHS = $(filter-out $(OOO_BE_ARCHS),$(OOO_ARCHS)) $(eval $(call gen_no_archs,OOO_LE_ARCHS)) - # ppc64el: see https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/patch/?id=be47aa72aad414537d27f0a18af7d067f1398666 and - # https://github.com/llvm/llvm-project/issues/63214 - OOO_CLANG_SUPPORTED_ARCHS := $(filter-out alpha ia64 ppc64el mipsel mips64el armhf,$(OOO_LE_ARCHS)) -OOO_CLANG_SUPPORTED_ARCHS := $(filter-out alpha ia64 mipsel mips64el,$(OOO_LE_ARCHS)) ++OOO_CLANG_SUPPORTED_ARCHS := $(filter-out alpha ia64 mipsel mips64el armhf,$(OOO_LE_ARCHS)) $(eval $(call gen_no_archs,OOO_CLANG_SUPPORTED_ARCHS)) # supported upstream (upstream does aarch64 flatpak builds)